Remove the long deprecated GDK_WINDOW_DIALOG type.

This has been deprecated forever, and was just left in for
compatibility reasons.

diff --git a/gdk/gdkevents.c b/gdk/gdkevents.c
index 0eaf7921f4590a8050ebbf15e55eed038be4d3b7..9d7cbefee60a119aee0c060c9adca75d66a3a146 100644 (file)
--- a/gdk/gdkevents.c
+++ b/gdk/gdkevents.c
@@ -1445,7 +1445,6 @@ gdk_synthesize_window_state (GdkWindow     *window,
   switch (((GdkWindowObject*) window)->window_type)
     {
     case GDK_WINDOW_TOPLEVEL:
-    case GDK_WINDOW_DIALOG:
     case GDK_WINDOW_TEMP: /* ? */
       gdk_display_put_event (gdk_drawable_get_display (window), &temp_event);
       break;

diff --git a/gdk/gdkwindow.c b/gdk/gdkwindow.c
index 236be0a1ca53f5237a09fb7e166f23beea6c896c..0026c424a5af96bc527725fd331899032aedd83a 100644 (file)
--- a/gdk/gdkwindow.c
+++ b/gdk/gdkwindow.c
@@ -1381,7 +1381,6 @@ gdk_window_new (GdkWindow     *parent,
   switch (private->window_type)
     {
     case GDK_WINDOW_TOPLEVEL:
-    case GDK_WINDOW_DIALOG:
     case GDK_WINDOW_TEMP:
     case GDK_WINDOW_OFFSCREEN:
       if (GDK_WINDOW_TYPE (parent) != GDK_WINDOW_ROOT)
@@ -1683,7 +1682,6 @@ gdk_window_reparent (GdkWindow *window,
     case GDK_WINDOW_OFFSCREEN:
     case GDK_WINDOW_TOPLEVEL:
     case GDK_WINDOW_CHILD:
-    case GDK_WINDOW_DIALOG:
     case GDK_WINDOW_TEMP:
       if (GDK_WINDOW_TYPE (window) != GDK_WINDOW_CHILD && \
          GDK_WINDOW_TYPE (window) != GDK_WINDOW_FOREIGN)
@@ -2018,7 +2016,6 @@ _gdk_window_destroy_hierarchy (GdkWindow *window,
       /* else fall thru */
     case GDK_WINDOW_TOPLEVEL:
     case GDK_WINDOW_CHILD:
-    case GDK_WINDOW_DIALOG:
     case GDK_WINDOW_TEMP:
     case GDK_WINDOW_FOREIGN:
     case GDK_WINDOW_OFFSCREEN:

diff --git a/gdk/gdkwindow.h b/gdk/gdkwindow.h
index dcc42acdf9fb28092edd1fe7db7776936d76f945..b2940955177ed91319eb484c7f8fca661bf268f4 100644 (file)
--- a/gdk/gdkwindow.h
+++ b/gdk/gdkwindow.h
@@ -65,7 +65,6 @@ typedef enum
  *  screen, and is created by the window system
  * @GDK_WINDOW_TOPLEVEL: toplevel window (used to implement #GtkWindow)
  * @GDK_WINDOW_CHILD: child window (used to implement e.g. #GtkEntry)
- * @GDK_WINDOW_DIALOG: useless/deprecated compatibility type
  * @GDK_WINDOW_TEMP: override redirect temporary window (used to implement
  *  #GtkMenu)
  * @GDK_WINDOW_FOREIGN: foreign window (see gdk_window_foreign_new())
@@ -79,7 +78,6 @@ typedef enum
   GDK_WINDOW_ROOT,
   GDK_WINDOW_TOPLEVEL,
   GDK_WINDOW_CHILD,
-  GDK_WINDOW_DIALOG,
   GDK_WINDOW_TEMP,
   GDK_WINDOW_FOREIGN,
   GDK_WINDOW_OFFSCREEN

diff --git a/gdk/quartz/gdkwindow-quartz.c b/gdk/quartz/gdkwindow-quartz.c
index 12a5adb9eb18e1f557656c23b43aa12446cc3d04..2800420622bbb0fab836e5cc07cc7718562a177b 100644 (file)
--- a/gdk/quartz/gdkwindow-quartz.c
+++ b/gdk/quartz/gdkwindow-quartz.c
@@ -854,7 +854,6 @@ _gdk_window_impl_new (GdkWindow     *window,
   switch (private->window_type)
     {
     case GDK_WINDOW_TOPLEVEL:
-    case GDK_WINDOW_DIALOG:
     case GDK_WINDOW_TEMP:
       if (GDK_WINDOW_TYPE (private->parent) != GDK_WINDOW_ROOT)
        {
@@ -906,10 +905,9 @@ _gdk_window_impl_new (GdkWindow     *window,
 
   impl->view = NULL;
 
-  switch (attributes->window_type) 
+  switch (attributes->window_type)
     {
     case GDK_WINDOW_TOPLEVEL:
-    case GDK_WINDOW_DIALOG:
     case GDK_WINDOW_TEMP:
       {
         NSScreen *screen;

diff --git a/gdk/win32/gdkwindow-win32.c b/gdk/win32/gdkwindow-win32.c
index 71b3dedc039d31123eb60f6fa96d7364ac316148..ea2a04d7f3f981af1615b00a3453ddf721b02dc5 100644 (file)
--- a/gdk/win32/gdkwindow-win32.c
+++ b/gdk/win32/gdkwindow-win32.c
@@ -401,17 +401,6 @@ RegisterGdkClass (GdkWindowType wtype, GdkWindowTypeHint wtype_hint)
       klass = klassCHILD;
       break;
       
-    case GDK_WINDOW_DIALOG:
-      if (0 == klassDIALOG)
-       {
-         wcl.lpszClassName = L"gdkWindowDialog";
-         wcl.style |= CS_SAVEBITS;
-         ONCE_PER_CLASS ();
-         klassDIALOG = RegisterClassExW (&wcl);
-       }
-      klass = klassDIALOG;
-      break;
-      
     case GDK_WINDOW_TEMP:
       if ((wtype_hint == GDK_WINDOW_TYPE_HINT_MENU) ||
           (wtype_hint == GDK_WINDOW_TYPE_HINT_DROPDOWN_MENU) ||
@@ -492,7 +481,6 @@ _gdk_window_impl_new (GdkWindow     *window,
            g_print ("_gdk_window_impl_new: %s\n",
                     (attributes->window_type == GDK_WINDOW_TOPLEVEL ? "TOPLEVEL" :
                      (attributes->window_type == GDK_WINDOW_CHILD ? "CHILD" :
-                      (attributes->window_type == GDK_WINDOW_DIALOG ? "DIALOG" :
                        (attributes->window_type == GDK_WINDOW_TEMP ? "TEMP" :
                         "???"))))));
 
@@ -554,7 +542,6 @@ _gdk_window_impl_new (GdkWindow     *window,
   switch (private->window_type)
     {
     case GDK_WINDOW_TOPLEVEL:
-    case GDK_WINDOW_DIALOG:
       if (GDK_WINDOW_TYPE (private->parent) != GDK_WINDOW_ROOT)
        {
          /* The common code warns for this case. */
@@ -1061,8 +1048,7 @@ show_window_internal (GdkWindow *window,
         SetWindowPos (GDK_WINDOW_HWND (window), HWND_TOPMOST,
                      0, 0, 0, 0,
                      SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOSIZE);
-      else if (GDK_WINDOW_TYPE (window) == GDK_WINDOW_TOPLEVEL ||
-              GDK_WINDOW_TYPE (window) == GDK_WINDOW_DIALOG)
+      else if (GDK_WINDOW_TYPE (window) == GDK_WINDOW_TOPLEVEL)
        {
           if (focus_on_map && private->accept_focus)
            {
@@ -1399,7 +1385,6 @@ gdk_win32_window_reparent (GdkWindow *window,
 
     case GDK_WINDOW_TOPLEVEL:
     case GDK_WINDOW_CHILD:
-    case GDK_WINDOW_DIALOG:
     case GDK_WINDOW_TEMP:
       if (WINDOW_IS_TOPLEVEL (window))
        {
@@ -1504,8 +1489,7 @@ get_effective_window_decorations (GdkWindow       *window,
   if (gdk_window_get_decorations (window, decoration))
     return TRUE;
     
-  if (((GdkWindowObject *) window)->window_type != GDK_WINDOW_TOPLEVEL &&
-      ((GdkWindowObject *) window)->window_type != GDK_WINDOW_DIALOG)
+  if (((GdkWindowObject *) window)->window_type != GDK_WINDOW_TOPLEVEL) 
     {
       return FALSE;
     }

diff --git a/gdk/x11/gdkwindow-x11.c b/gdk/x11/gdkwindow-x11.c
index bf919cbd150c549e977800975f18f0bd486a2f5b..d601f0e8aff64c09ae3ce706da58e29d784dfb2a 100644 (file)
--- a/gdk/x11/gdkwindow-x11.c
+++ b/gdk/x11/gdkwindow-x11.c
@@ -598,12 +598,9 @@ setup_toplevel_window (GdkWindow *window,
   XSizeHints size_hints;
   long pid;
   Window leader_window;
-    
-  if (GDK_WINDOW_TYPE (window) == GDK_WINDOW_DIALOG)
-    XSetTransientForHint (xdisplay, xid, xparent);
-  
+
   set_wm_protocols (window);
-  
+
   if (!obj->input_only)
     {
       /* The focus window is off the visible area, and serves to receive key
@@ -723,7 +720,6 @@ _gdk_window_impl_new (GdkWindow     *window,
   switch (private->window_type)
     {
     case GDK_WINDOW_TOPLEVEL:
-    case GDK_WINDOW_DIALOG:
     case GDK_WINDOW_TEMP:
       if (GDK_WINDOW_TYPE (private->parent) != GDK_WINDOW_ROOT)
        {
@@ -809,7 +805,6 @@ _gdk_window_impl_new (GdkWindow     *window,
 
   switch (GDK_WINDOW_TYPE (private))
     {
-    case GDK_WINDOW_DIALOG:
     case GDK_WINDOW_TOPLEVEL:
     case GDK_WINDOW_TEMP:
       if (attributes_mask & GDK_WA_TITLE)
@@ -1426,7 +1421,6 @@ gdk_window_x11_hide (GdkWindow *window)
   switch (private->window_type)
     {
     case GDK_WINDOW_TOPLEVEL:
-    case GDK_WINDOW_DIALOG:
     case GDK_WINDOW_TEMP: /* ? */
       gdk_window_withdraw (window);
       return;
@@ -1659,7 +1653,6 @@ gdk_window_x11_reparent (GdkWindow *window,
       
     case GDK_WINDOW_TOPLEVEL:
     case GDK_WINDOW_CHILD:
-    case GDK_WINDOW_DIALOG:
     case GDK_WINDOW_TEMP:
       if (WINDOW_IS_TOPLEVEL (window) &&
          impl->toplevel)